Update packages file for version 29780

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile.common

@@ -186,6 +186,11 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
 		bash update_changelog.sh ; \
 		git commit --amend --no-edit Change* ; \
 	fi
+	@git diff | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py > for-review.txt ;
+	@printf "\n**\n"
+	@printf "** NOTICE: A patch with changes is available in the file for-review.txt\n"
+	@printf "** Please submit for code review with git send-email\n"
+	@printf "**\n\n"
 
 #help autospecnogit: Runs autospec, but does not create a commit
 autospecnogit:
@@ -318,7 +323,7 @@ scratch: $(SPECFILE) upstream $(SRPMFILE) kojidef
 
 #help scratch-wait: Performs scratch-build on package.
 scratch-wait: $(SPECFILE) upstream $(SRPMFILE) kojidef
-	$(KOJI_CMD) build --scratch $(KOJI_TAG) $(SRPMFILE)
+	$(KOJI_CMD) build --scratch --wait $(KOJI_TAG) $(SRPMFILE)
 
 #help koji-nowait: Same as 'make koji', but do not block
 koji-nowait:
@@ -411,27 +416,43 @@ install:
 #help install-debuginfo-local: Install locally built debuginfo RPM to
 #help the automatic debuginfo cache location (/var/cache/debuginfo)
 install-debuginfo-local:
+	@if [ -z "${DEBUGINFO_RPM}" ]; then \
+		echo "No debuginfo to install... skipping"; \
+		exit 0; \
+	fi; \
+	echo -n "Installing ${DEBUGINFO_RPM}... "; \
 	tmpdir=$$(mktemp -d); \
-	rpm2cpio ${DEBUGINFO_RPM} | ( cd $$tmpdir; cpio -i -d -u); \
+	rpm2cpio ${DEBUGINFO_RPM} | ( cd $$tmpdir; cpio -i -d -u 2> /dev/null); \
 	dest=/var/cache/debuginfo/lib; \
-	find $$tmpdir/usr/lib/debug/ -mindepth 1 -maxdepth 1 | while read -r d; do \
+	find $$tmpdir/usr/lib/debug/ -mindepth 1 -maxdepth 1 2> /dev/null | while read -r d; do \
+		sudo chown -R dbginfo:dbginfo "$$d"; \
+		sudo cp -a "$$d" $$dest/; \
+	done; \
+	find $$tmpdir/usr/share/debug/ -mindepth 1 -maxdepth 1 -regextype awk -regex '.*/(.build-id|boot|lib|sbin|usr)$$' 2> /dev/null | while read -r d; do \
 		sudo chown -R dbginfo:dbginfo "$$d"; \
 		sudo cp -a "$$d" $$dest/; \
 	done; \
 	dest=/var/cache/debuginfo/src; \
-	find $$tmpdir/usr/src/debug/ -mindepth 1 -maxdepth 1 | while read -r d; do \
+	find $$tmpdir/usr/src/debug/ -mindepth 1 -maxdepth 1 2> /dev/null | while read -r d; do \
 		sudo chown -R dbginfo:dbginfo "$$d"; \
 		sudo cp -a "$$d" $$dest/; \
 	done; \
-	sudo rm -rf $$tmpdir
+	find $$tmpdir/usr/share/debug/src/ -mindepth 1 -maxdepth 1 2> /dev/null | while read -r d; do \
+		sudo chown -R dbginfo:dbginfo "$$d"; \
+		sudo cp -a "$$d" $$dest/; \
+	done; \
+	sudo rm -rf $$tmpdir; \
+	echo "done"
 
 #help install-local: Install locally built RPMs to the root filesystem. Note that the
 #help debuginfo RPM installs to /var/cache/debuginfo
 install-local:
-	for r in $(filter-out ${DEBUGINFO_RPM},${RPMS}); do \
+	@for r in $(filter-out ${DEBUGINFO_RPM},${RPMS}); do \
-		rpm2cpio $$r | (cd /; sudo cpio -i -d -u); \
+		echo -n "Installing $$r... "; \
+		rpm2cpio $$r | (cd /; sudo cpio -i -d -u 2> /dev/null); \
+		echo "done"; \
 	done
-	$(MAKE) install-debuginfo-local
+	@$(MAKE) -s install-debuginfo-local
 
 #help install-mock: Install locally built RPMs to the mock rootcache
 #help filesystem. This command is usually used with "make shell".

Makefile.toplevel

@@ -226,8 +226,15 @@ autospecnew: preautospecnew-checks localreponotice
 			$${SETVERSION:+ --version $${SETVERSION}} \
 			${NON_INTERACTIVE} ${SKIP_GIT} ${CLEANUP} \
 			$(URL); \
-		[ $$? -eq 0 ] && $(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \
+		if [ $$? -eq 0 ]; then \
-		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
+			$(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \
+			$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
+			python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) format-patch -1 --stdout) > $(TOPLVL)/packages/$(NAME)/for-review.txt; \
+			printf "\n**\n"; \
+			printf "** NOTICE: A patch with changes is available in the file $(TOPLVL)/packages/$(NAME)/for-review.txt\n"; \
+			printf "** Please submit for code review with git send-email\n"; \
+			printf "**\n\n"; \
+		fi; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \
 		exit 1; \

packages

@@ -60,6 +60,7 @@ PasteDeploy
 Pillow
 Pint
 PyDispatcher
+PyICU
 PyJWT
 PyMySQL
 PyNaCl
@@ -323,6 +324,7 @@ R-dotCall64
 R-downloader
 R-dplyr
 R-drc
+R-dtplyr
 R-dtw
 R-dygraphs
 R-dynlm
@@ -393,6 +395,7 @@ R-fossil
 R-fpc
 R-fracdiff
 R-fs
+R-fst
 R-futile.logger
 R-futile.options
 R-future
@@ -436,6 +439,7 @@ R-haplo.stats
 R-haven
 R-hdrcde
 R-here
+R-hexView
 R-hexbin
 R-highlight
 R-highr
@@ -453,6 +457,7 @@ R-ica
 R-igraph
 R-import
 R-ineq
+R-influenceR
 R-ini
 R-inline
 R-inum
@@ -490,6 +495,7 @@ R-leaps
 R-lfe
 R-lhs
 R-libcoin
+R-lintr
 R-listenv
 R-listviewer
 R-lle
@@ -663,6 +669,8 @@ R-rasterVis
 R-rbenchmark
 R-rcmdcheck
 R-reactR
+R-reactlog
+R-readODS
 R-readr
 R-readstata13
 R-readxl
@@ -679,6 +687,7 @@ R-reprex
 R-reshape
 R-reshape2
 R-reticulate
+R-rex
 R-rgenoud
 R-rgeos
 R-rgl
@@ -691,6 +700,7 @@ R-rjags
 R-rjstat
 R-rlang
 R-rmarkdown
+R-rmatio
 R-rms
 R-rmutil
 R-rncl
@@ -712,6 +722,7 @@ R-rsdmx
 R-rstan
 R-rstanarm
 R-rstantools
+R-rstudio
 R-rstudioapi
 R-rsvg
 R-runjags
@@ -771,6 +782,7 @@ R-startupmsg
 R-statip
 R-statmod
 R-statnet.common
+R-stringdist
 R-stringi
 R-stringr
 R-strucchange
@@ -826,6 +838,7 @@ R-varImp
 R-vcd
 R-vcdExtra
 R-vcr
+R-vctrs
 R-vegan
 R-vioplot
 R-viridis
@@ -863,6 +876,8 @@ SDL_image
 SDL_mixer
 SDL_net
 SDL_ttf
+SFCGAL
+SFML
 SPIRV-Headers
 SPIRV-Tools
 SQLAlchemy
@@ -875,6 +890,7 @@ SuiteSparse
 Tempita
 Theano
 Thunar
+UCD
 UkPostcodeParser
 Unidecode
 Uranium
@@ -964,6 +980,7 @@ anyjson
 apache-ant
 apache-hadoop
 apache-kafka
+apache-libcloud
 apache-maven
 apache-spark
 apache-zookeeper
@@ -978,6 +995,7 @@ argcomplete
 argon2
 argon2_cffi
 argparse
+aria2
 ark
 armadillo
 artikulate
@@ -1005,6 +1023,8 @@ atomicwrites
 attica
 attr
 attrs
+audacious
+audacious-plugins
 audiofile
 audisp-json
 audit
@@ -1108,6 +1128,7 @@ buildreq-kernel
 buildreq-make
 buildreq-meson
 buildreq-mvn
+buildreq-php
 buildreq-qmake
 buildreq-scons
 bundle-chroot-builder
@@ -1126,6 +1147,7 @@ cairo
 cairomm
 calc
 calendarsupport
+can-utils
 cantarell-fonts
 cantata
 cantor
@@ -1138,6 +1160,7 @@ catch2
 catkin
 catkin_pkg
 ccache
+ccid
 ceilometer
 ceph
 ceph-deploy
@@ -1185,6 +1208,7 @@ clr-init
 clr-installer
 clr-man-pages
 clr-network-troubleshooter
+clr-one-shot-updates
 clr-power-tweaks
 clr-python-timestamp
 clr-pyversion-strip
@@ -1207,6 +1231,7 @@ cnf
 cni
 cni-plugins
 cockpit
+codec2
 codecov
 cogl
 coinmp
@@ -1233,16 +1258,19 @@ collectl
 colorama
 colord
 colord-gtk
+columbiad
 comedilib
 comfortaa-fonts
 commonmark
 compat-SDL2-soname1
 compat-cryptsetup-soname4
 compat-curl-gnutls-soname4
+compat-double-conversion-soname1
 compat-efivar-soname0
 compat-enchant-soname1
 compat-exiv2-soname26
 compat-fuse-soname2
+compat-gdal-soname20
 compat-gegl
 compat-gegl-0.3
 compat-glew-soname1
@@ -1279,6 +1307,8 @@ compat-openssl-soname-10
 compat-poppler-soname78
 compat-poppler-soname82
 compat-poppler-soname83
+compat-poppler-soname86
+compat-proj-soname13
 compat-protobuf-soname14
 compat-protobuf-soname15
 compat-python36
@@ -1308,6 +1338,7 @@ cpio
 cppcheck
 cpprestsdk
 cppunit
+cppzmq
 cpuid
 cpuloadgen
 cracklib
@@ -1513,6 +1544,7 @@ edk2
 efibootmgr
 efitools
 efivar
+efl
 eigen
 elasticsearch
 elasticsearch-dep
@@ -1522,9 +1554,11 @@ elfutils
 elixir
 ell
 emacs
+emacs-x11
 embree
 empy
 enchant
+enlightenment
 entrypoints
 enum34
 envs
@@ -1534,12 +1568,15 @@ epm
 epydoc
 eternalegypt
 ethtool
+etr
+evdev
 eventlet
 eventviews
 evince
 evolution
 evolution-data-server
 evolution-ews
+evtest
 execnet
 exempi
 exiv2
@@ -1549,6 +1586,7 @@ expect
 extra-cmake-modules
 extras
 f2fs-tools
+faas-cli
 faba-icon-theme
 fakeroot
 fann
@@ -1556,11 +1594,13 @@ fann2
 farstream
 fasteners
 fastimport
+fastnumbers
 fcgi
 fcoe-utils
 fdm_materials
 feh
 fetchmail
+ffmpegthumbs
 fftw
 file
 file-roller
@@ -1588,9 +1628,11 @@ flatpak
 flatpak-builder
 fldigi
 flex
+flink-dep
 flmsg
 flnet
 fltk
+fluidsynth
 folks
 font-util
 fontconfig
@@ -1598,6 +1640,7 @@ fontforge
 fonttools
 fossil
 frameworkintegration
+freedv
 freeglut
 freeipmi
 freetype
@@ -1621,6 +1664,8 @@ gawk
 gc
 gcab
 gcc
+gcc7
+gcc8
 gcompris-qt
 gcr
 gcs-oauth2-boto-plugin
@@ -1644,8 +1689,10 @@ gexiv2
 gfbgraph
 gflags
 gftp
+ghc
 ghostscript
 gimp
+girara
 git
 git-gui
 gitdb2
@@ -1678,6 +1725,7 @@ gnome-applets
 gnome-autoar
 gnome-backgrounds
 gnome-bluetooth
+gnome-boxes
 gnome-calculator
 gnome-calendar
 gnome-characters
@@ -1735,6 +1783,7 @@ gperf
 gperftools
 gpgme
 gphoto2
+gpm
 gpredict
 gptfdisk
 gradle
@@ -1756,6 +1805,7 @@ grpcio
 grub
 gsettings-desktop-schemas
 gsl
+gsm
 gsound
 gspell
 gst-plugins-bad
@@ -1791,7 +1841,9 @@ hammock
 haproxy
 hardlink
 harfbuzz
+haskell-random
 hdf5
+hdmedians
 hdparm
 heat
 helloworld
@@ -1803,6 +1855,7 @@ hicolor-icon-theme
 hiredis
 hold
 home-assistant
+home-assistant-frontend
 horizon
 horovod
 hostname
@@ -1829,6 +1882,8 @@ iasimage
 ibus
 ibus-libpinyin
 ibus-table
+ibus-typing-booster
+ibus-unikey
 icalendar
 icdiff
 iceauth
@@ -1853,6 +1908,7 @@ influxdb
 iniparse
 init-rdahead
 inkscape
+innoextract
 inotify-tools
 intel-cmt-cat
 intel-compute-runtime
@@ -1910,6 +1966,7 @@ jedi-vim
 jeepney
 jemalloc
 jmespath
+joblib
 joe
 josepy
 jq
@@ -1938,6 +1995,7 @@ kactivitymanagerd
 kafka-dep
 kalarm
 kalarmcal
+kalgebra
 kamera
 kanagram
 kapidox
@@ -1985,6 +2043,7 @@ kde-dev-utils
 kde-gtk-config
 kdebugsettings
 kdeclarative
+kdeconnect-kde
 kdecoration
 kded
 kdeedu-data
@@ -2029,6 +2088,7 @@ kgeography
 kget
 kglobalaccel
 kgoldrunner
+kgpg
 kguiaddons
 khal
 khangman
@@ -2137,7 +2197,13 @@ ktimer
 ktnef
 ktp-approver
 ktp-common-internals
+ktp-contact-list
+ktp-contact-runner
 ktp-desktop-applets
+ktp-filetransfer-handler
+ktp-kded-module
+ktp-send-file
+ktp-text-ui
 ktuberling
 kturtle
 kubernetes
@@ -2199,6 +2265,7 @@ libaio
 libappindicator
 libarchive
 libarchive-c
+libass
 libassuan
 libasyncns
 libatasmart
@@ -2265,6 +2332,7 @@ libgit2-glib
 libglade
 libgnome-keyring
 libgnomekbd
+libgovirt
 libgpg-error
 libgphoto2
 libgravatar
@@ -2297,6 +2365,7 @@ libkipi
 libkleo
 libkmahjongg
 libkomparediff2
+libksane
 libksba
 libkscreen
 libksieve
@@ -2318,6 +2387,7 @@ libmtp
 libmwaw
 libmypaint
 libndp
+libnetfilter_acct
 libnetfilter_conntrack
 libnetfilter_cthelper
 libnetfilter_cttimeout
@@ -2387,6 +2457,7 @@ libtheora
 libtirpc
 libtk-img
 libtool
+libtorrent-rasterbar
 libudev0-shim
 libuev
 libuninameslist
@@ -2436,6 +2507,7 @@ linecache2
 links
 linux
 linux-aws
+linux-current
 linux-firmware
 linux-firmware-ipu
 linux-gce
@@ -2443,14 +2515,17 @@ linux-hyperv
 linux-hyperv-lts
 linux-iot-lts2017-preempt-rt
 linux-iot-lts2018
+linux-iot-lts2018-preempt-rt
+linux-iot-lts2019
 linux-kata
 linux-kvm
 linux-libc-headers
 linux-lts2017
 linux-lts2018
+linux-mainline
 linux-networktest
+linux-next
 linux-oracle
-linux-pk414-preempt-rt
 linux-preempt-rt
 linux-steam-integration
 linux-tools
@@ -2463,6 +2538,7 @@ lm-sensors
 lmdb
 locket
 locustio
+log4cpp
 logilab-common
 logrotate
 logutils
@@ -2478,6 +2554,7 @@ lua
 lua52
 lualgi
 luarocks
+lutris
 lxml
 lxqt-about
 lxqt-admin
@@ -2572,7 +2649,9 @@ mpc
 mpfr
 mpg123
 mpi4py
+mpir
 mpmath
+mpv
 mraa
 msgpack
 msm
@@ -2583,6 +2662,7 @@ msrestazure
 mstflint
 mtd-utils
 mtdev
+mtools
 mtr
 multidict
 multimon-ng
@@ -2600,10 +2680,12 @@ mycroft-core
 mypaint-brushes
 mypy
 mypy_extensions
+mysqltcl
 mythes
 nagios-plugins
 nano
 nasm
+natsort
 nautilus
 nbconvert
 nbformat
@@ -2622,6 +2704,7 @@ net-tools
 netaddr
 netbase
 netcdf
+netdata
 netdisco
 netifaces
 netkit-telnet
@@ -2638,7 +2721,9 @@ nfs4-acl-tools
 nftables
 nghttp2
 nginx
+nginx-mainline
 nicstat
+nim
 ninja
 nload
 nlopt
@@ -2651,6 +2736,7 @@ nose-cover3
 nose-parameterized
 nosexcover
 nosync
+not-ffmpeg
 notebook
 notmuch
 noto-cjk
@@ -2812,6 +2898,7 @@ pciutils
 pcmanfm-qt
 pcre
 pcre2
+pcsc-lite
 pdns
 pdns-recursor
 pecan
@@ -2848,6 +2935,7 @@ perl-B-Hooks-OP-Check
 perl-B-Keywords
 perl-BSD-Resource
 perl-Biblio-EndnoteStyle
+perl-Bit-Vector
 perl-Browser-Open
 perl-Business-ISBN
 perl-Business-ISBN-Data
@@ -2948,6 +3036,7 @@ perl-Data-Page
 perl-Data-Password
 perl-Data-Printer
 perl-Data-Random
+perl-Data-Section
 perl-Data-Serializer
 perl-Data-Structure-Util
 perl-Data-Uniqid
@@ -3298,6 +3387,7 @@ perl-Set-Scalar
 perl-Smart-Comments
 perl-Socket-MsgHdr
 perl-Socket6
+perl-Software-License
 perl-Sort-Key
 perl-Sort-Naturally
 perl-Sort-Versions
@@ -3482,6 +3572,13 @@ pexpect
 phonon
 phoronix-test-suite
 php
+php-imagick
+php-mailparse
+php-redis
+php-timezonedb
+php-xdebug
+php-yaml
+php-zip
 pickleshare
 picmi
 picocom
@@ -3516,6 +3613,7 @@ plasma-workspace-wallpapers
 pluggy
 ply
 plzip
+pm-graph
 pmdk
 polkit
 polkit-kde-agent
@@ -3527,6 +3625,7 @@ portaudio
 portend
 positional
 posix_ipc
+postgis
 postgresql
 potrace
 povray
@@ -3605,6 +3704,7 @@ pyliblzma
 pylint
 pymemcache
 pymongo
+pyotherside
 pyotp
 pypandoc
 pyparsing
@@ -3682,7 +3782,6 @@ python-swiftclient
 python-systemd
 python-tabulate
 python-tappy
-python-toml
 python-troveclient
 python-urwid
 python-utils
@@ -3702,11 +3801,13 @@ pywbem
 pyxattr
 pyxdg
 pyzmq
+qbittorrent
 qca-qt5
 qemu
 qemu-guest-additions
 qemu-lite
 qgit
+qhull
 qml-box2d
 qpdf
 qpid-python
@@ -3757,8 +3858,11 @@ quazip
 quilt
 qwt
 rabbitmq-c
+rabbitmq-java-client
+rabbitmq-java-client-dep
 rabbitmq-server
 radvd
+rage
 ragel
 raptor2
 rasqal
@@ -3773,6 +3877,7 @@ recommonmark
 redis
 redis-native
 redland
+redshift
 redsocks
 renderdoc
 reno
@@ -3834,12 +3939,14 @@ sbc
 sbsigntools
 scala
 scala-dep
+scdoc
 scene-alembic
 scikit-build
 scikit-image
 scikit-learn
 scipy
 scons
+scowl
 screen
 scripttest
 scrypt
@@ -3850,6 +3957,7 @@ seaborn
 seahorse
 secretstorage
 sed
+segno
 selenium
 semantic_version
 seqdiag
@@ -3859,6 +3967,7 @@ setproctitle
 setserial
 setuptools
 setuptools-legacy
+setuptools-markdown
 setuptools_scm
 setuptools_scm_git_archive
 setxkbmap
@@ -3881,7 +3990,9 @@ smart_open
 smartcols
 smartmontools
 smmap2
+snabb
 snappy
+snitun
 snowballstemmer
 socat
 sof-crosstool-ng
@@ -3939,6 +4050,7 @@ startup-notification
 statsd
 statsmodels
 stellarium
+step
 stestr
 stevedore
 stow
@@ -3951,6 +4063,7 @@ subversion
 sudo
 suds-jurko
 sundials
+supertuxkart
 sure
 suricata
 svg.path
@@ -4002,7 +4115,10 @@ tensorflow-probability
 termcolor
 terminado
 terminaltables
+terminology
 terminus-font
+test-generator
+testdisk
 testpath
 testrepository
 testresources
@@ -4035,7 +4151,9 @@ tinyxml2
 tiptop
 tk
 tmux
+todoist
 tokyocabinet
+toml
 toolz
 tooz
 tornado
@@ -4110,9 +4228,11 @@ virt-manager
 virt-viewer
 virtualenv
 vlc
+volk
 volume_key
 voluptuous
 voluptuous-serialize
+vpnc
 vsqlite
 vte
 waffle
@@ -4134,6 +4254,7 @@ weechat
 weston
 wget
 wheel
+wheelhouse-uploader
 which
 whois
 widgetsnbextension
@@ -4144,6 +4265,7 @@ wireshark
 woff2
 wok
 wol
+wordpress
 wpa_supplicant
 wrapt
 wsgi_intercept
@@ -4171,7 +4293,6 @@ xdg-user-dirs-gtk
 xdg-utils
 xdotool
 xdpyinfo
-xemacs
 xerces-c
 xf86-input-evdev
 xf86-input-libinput
@@ -4208,6 +4329,7 @@ xkbcomp
 xkeyboard-config
 xkill
 xlog
+xmlb
 xmlrpc-c
 xmlsec1
 xmlstarlet
@@ -4231,6 +4353,7 @@ xterm
 xtrans
 xvfb-run
 xwd
+xwdrun
 xwininfo
 xz
 yajl
@@ -4249,6 +4372,7 @@ yum
 yum-metadata-parser
 zVMCloudConnector
 zake
+zathura
 zc.lockfile
 zenity
 zeroconf

patchfilter.py

@@ -0,0 +1,348 @@
+#!/usr/bin/python3
+import sys
+import tempfile
+import subprocess
+
+header = list()
+files = list()
+files_chunks = dict()	# dict to list
+files_header = dict()	# dict to list
+
+
+
+def push_chunk(file, chunk):
+    global files_chunks
+    
+    if len(chunk) == 0:
+        return
+    
+    if file not in files_chunks:
+        files_chunks[file] = list()
+        
+    files_chunks[file].append(chunk)
+
+
+def parse_patch(lines):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    
+    phase = 0
+    
+    currentfile = ""
+    currentchunk = list()
+    
+        
+    for line in lines:
+        line = line.replace("\n","")
+        
+        if line.startswith("diff --git"):
+        
+            push_chunk(currentfile, currentchunk)
+            currentchunk = list()
+        
+            filename = line.replace("diff --git","")
+            index= filename.find("b/")
+            if index >= 0:
+                filename = filename[index:].strip()
+                currentfile = filename
+                files.append(currentfile)
+                phase = 1
+                
+        if line.startswith("@@"):
+            push_chunk(currentfile, currentchunk)
+            currentchunk = list()
+            phase = 2
+            
+            
+        if phase == 0:
+            header.append(line)
+        if phase == 1:
+            if currentfile not in files_header:
+                files_header[currentfile] = list()
+            files_header[currentfile].append(line) 
+        if phase == 2:
+            currentchunk.append(line)
+        
+    push_chunk(currentfile, currentchunk)
+    currentchunk = list()
+
+def print_all():
+    global header
+    global files
+    global files_chunks
+    global files_header
+
+    for line in header:
+        print(line)
+    for file in files:
+        for line in files_header[file]:
+            print(line)
+        if file in files_chunks:
+            for chunk in files_chunks[file]:
+                for line in chunk:
+                    print(line)
+                    
+                    
+def zap_entire_file(filename):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    if filename in files:
+        files.remove(filename)                
+
+def zap_entire_file_end(filename):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    for file in files:
+        if file.endswith(filename):
+            files.remove(file)                
+            
+def zap_line_in_file(filename, match):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    for file in files:
+        if file.endswith(filename):
+            for chunk in files_chunks[filename]:
+                to_delete = list()
+                for line in chunk:
+                    if line == ("+" + match):
+                        to_delete.append(line)
+                    if line == ("-" + match):
+                        to_delete.append(line)
+                for line in to_delete:
+                    chunk.remove(line)
+            
+
+def zap_line_in_file_start(filename, match):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    
+    for file in files:
+        if file.endswith(filename):
+            for chunk in files_chunks[file]:
+                to_remove = list()
+                for line in chunk:
+                    if line.startswith("+" + match):
+                        to_remove.append(line)
+                    if line.startswith("-" + match):
+                        to_remove.append(line)
+                for line in to_remove:
+                    chunk.remove(line)
+            
+def zap_plus_line_in_file(filename):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    
+    for file in files:
+        if file.endswith(filename):
+            for chunk in files_chunks[file]:
+                to_remove = list()
+                for line in chunk:
+                    if line.startswith("+"):
+                        to_remove.append(line)
+                for line in to_remove:
+                    chunk.remove(line)
+            
+
+
+def chunk_empty(chunk):
+    for line in chunk:
+        if len(line) > 0 and line[0] == '+':
+            return False
+    return True
+                           
+def zap_empty_chunks():
+    global header
+    global files
+    global files_chunks
+    global files_header
+    files_to_remove = list()
+    for file in files:
+        if file not in files_chunks:
+            files.remove(file)
+            continue
+        to_remove = list()
+        for chunk in files_chunks[file]:
+            if chunk_empty(chunk):
+                to_remove.append(chunk)
+        for c in to_remove:
+            files_chunks[file].remove(c)
+        if len(files_chunks[file]) == 0:
+            files_to_remove.append(file)
+            
+    for file in files_to_remove:
+        files.remove(file)
+            
+            
+
+
+def main():
+
+    if len(sys.argv) > 1:
+        filename = sys.argv[1]
+    
+        with open (filename, "r") as myfile:
+            lines = myfile.readlines()
+    else:
+        output = subprocess.check_output("git format-patch -1 --stdout", shell=True).decode("latin-1")
+        lines = output.split("\n")
+        
+    parse_patch(lines)
+
+    zap_entire_file("b/release")
+    zap_entire_file("b/buildreq_cache")
+    zap_entire_file("b/.gitignore")
+    zap_entire_file("b/upstream")
+    zap_entire_file("b/NEWS")
+    zap_entire_file("b/ChangeLog")
+    zap_entire_file_end("xz.sig")
+    zap_entire_file_end("gz.sig")
+    zap_entire_file_end("bz2.sig")
+    
+    zap_line_in_file("b/testresults", "Total : 0")
+    zap_line_in_file("b/testresults", "Pass : 0")
+    zap_line_in_file("b/testresults", "Fail : 0")
+    zap_line_in_file("b/testresults", "XFail : 0")
+    zap_line_in_file("b/testresults", "Skip : 0")
+    
+    zap_line_in_file("b/requires_ban", "#FOO")
+    zap_line_in_file("b/Makefile", "ARCHIVES = ")
+    zap_line_in_file("b/Makefile", "include ../common/Makefile.common")
+    zap_line_in_file("b/Makefile", "")
+    
+    zap_line_in_file_start(".spec", "Release  :")
+    zap_line_in_file_start(".spec", "Source99 :")
+    zap_line_in_file_start(".spec", "Source0  :")
+    zap_line_in_file_start(".spec", "export SOURCE_DATE_EPOCH")
+    zap_line_in_file_start(".spec", "%setup -q -n ")
+    zap_line_in_file_start(".spec", "URL      :")
+    zap_line_in_file_start(".spec", "Version  :")
+    zap_line_in_file_start(".spec", "Group    : Development/Tools")
+    zap_line_in_file_start(".spec", "No detailed description available")
+    zap_line_in_file_start(".spec", "bin components for the")
+    zap_line_in_file_start(".spec", "dev components for the")
+    zap_line_in_file_start(".spec", "lib components for the")
+    zap_line_in_file_start(".spec", "data components for the")
+    zap_line_in_file_start(".spec", "locales components for the")
+    zap_line_in_file_start(".spec", "license components for the")
+    zap_line_in_file_start(".spec", "Group: Default")
+    zap_line_in_file_start(".spec", "export http_proxy=http://127.0.0.1:9/")
+    zap_line_in_file_start(".spec", "export https_proxy=http://127.0.0.1:9/")
+    zap_line_in_file_start(".spec", "export ftp_proxy=http://127.0.0.1:9/")
+    zap_line_in_file_start(".spec", "export no_proxy=localhost,127.0.0.1,0.0.0.0")
+    zap_line_in_file_start(".spec", "Summary:")
+    zap_line_in_file_start(".spec", "Group: Development")
+    zap_line_in_file_start(".spec", "Group: Binaries")
+    zap_line_in_file_start(".spec", "Group: Data")
+    zap_line_in_file_start(".spec", "Group: Libraries")
+    zap_line_in_file_start(".spec", "export LANG=C")
+    zap_line_in_file_start(".spec", "%description lib")
+    zap_line_in_file_start(".spec", "%description bin")
+    zap_line_in_file_start(".spec", "%description data")
+    zap_line_in_file_start(".spec", "%description locales")
+    zap_line_in_file_start(".spec", "%description dev")
+    zap_line_in_file_start(".spec", "%description license")
+ 
+    zap_line_in_file_start("b/Makefile", "URL =")
+    zap_line_in_file_start("b/Makefile", "PKG_NAME :=")
+
+    zap_line_in_file("b/options.conf", "archives = ")
+    zap_line_in_file("b/options.conf", "giturl = ")
+    zap_line_in_file("b/options.conf", "[package]")
+    zap_line_in_file("b/options.conf", "")
+    zap_line_in_file("b/options.conf", "[autospec]")
+    zap_line_in_file("b/options.conf", "# build 32 bit libraries")
+    zap_line_in_file("b/options.conf", "32bit = false")
+    zap_line_in_file("b/options.conf", "# allow package to build with test failures")
+    zap_line_in_file("b/options.conf", "allow_test_failures = false")
+    zap_line_in_file("b/options.conf", "# unset %build ld_as_needed variable")
+    zap_line_in_file("b/options.conf", "asneeded = false")
+    zap_line_in_file("b/options.conf", "# this package is trusted enough to automatically update (used by other tools)")
+    zap_line_in_file("b/options.conf", "autoupdate = false")
+    zap_line_in_file("b/options.conf", "# extend flags with '-std=gnu++98")
+    zap_line_in_file("b/options.conf", "broken_c++ = false")
+    zap_line_in_file("b/options.conf", "# disable parallelization during build")
+    zap_line_in_file("b/options.conf", "broken_parallel_build = false")
+    zap_line_in_file("b/options.conf", "# this package is a library compatability package and only ships versioned library files")
+    zap_line_in_file("b/options.conf", "compat = false")
+    zap_line_in_file("b/options.conf", "# set conservative build flags")
+    zap_line_in_file("b/options.conf", "conservative_flags = false")
+    zap_line_in_file("b/options.conf", "# dev package requires the extras to be installed")
+    zap_line_in_file("b/options.conf", "dev_requires_extras = false")
+    zap_line_in_file("b/options.conf", "# pass -ffast-math to compiler")
+    zap_line_in_file("b/options.conf", "fast-math = false")
+    zap_line_in_file("b/options.conf", "# optimize build for speed over size")
+    zap_line_in_file("b/options.conf", "funroll-loops = false")
+    zap_line_in_file("b/options.conf", "# set flags to smallest -02 flags possible")
+    zap_line_in_file("b/options.conf", "insecure_build = false")
+    zap_line_in_file("b/options.conf", "# do not remove static libraries")
+    zap_line_in_file("b/options.conf", "keepstatic = false")
+    zap_line_in_file("b/options.conf", "# do not require autostart subpackage")
+    zap_line_in_file("b/options.conf", "no_autostart = false")
+    zap_line_in_file("b/options.conf", "# disable stripping binaries")
+    zap_line_in_file("b/options.conf", "nostrip = false")
+    zap_line_in_file("b/options.conf", "# optimize build for size over speed")
+    zap_line_in_file("b/options.conf", "optimize_size = false")
+    zap_line_in_file("b/options.conf", "# set profile for pgo")
+    zap_line_in_file("b/options.conf", "pgo = false")
+    zap_line_in_file("b/options.conf", "# set flags for security-sensitive builds")
+    zap_line_in_file("b/options.conf", "security_sensitive = false")
+    zap_line_in_file("b/options.conf", "# do not run test suite")
+    zap_line_in_file("b/options.conf", "skip_tests = false")
+    zap_line_in_file("b/options.conf", "# add .so files to the lib package instead of dev")
+    zap_line_in_file("b/options.conf", "so_to_lib = false")
+    zap_line_in_file("b/options.conf", "# configure build for avx2")
+    zap_line_in_file("b/options.conf", "use_avx2 = false")
+    zap_line_in_file("b/options.conf", "# configure build for avx512")
+    zap_line_in_file("b/options.conf", "use_avx512 = false")
+    zap_line_in_file("b/options.conf", "# add clang flags")
+    zap_line_in_file("b/options.conf", "use_clang = false")
+    zap_line_in_file("b/options.conf", "# configure build for lto")
+    zap_line_in_file("b/options.conf", "use_lto = false")
+    zap_line_in_file("b/options.conf", "# require package verification for build")
+    zap_line_in_file("b/options.conf", "verify_required = true")
+
+    zap_line_in_file("b/buildreq_add", "# This file contains additional build requirements that did not get")
+    zap_line_in_file("b/buildreq_add", "# picked up automatically. One name per line, no whitespace.")
+    zap_line_in_file("b/buildreq_ban", "# This file contains build requirements that get picked up but are")
+    zap_line_in_file("b/buildreq_ban", "# undesirable. One entry per line, no whitespace.")
+    
+    
+    zap_line_in_file("b/excludes", "# This file contains the output files that need %exclude. Full path")
+    zap_line_in_file("b/excludes", "# names, one per line.")
+
+    zap_line_in_file("b/pkgconfig_add", "# This file contains additional pkgconfig build requirements that did")
+    zap_line_in_file("b/pkgconfig_add", "# not get picked up automatically. One name per line, no whitespace.")
+    zap_line_in_file("b/pkgconfig_ban", "# This file contains pkgconfig build requirements that get picked up")
+    zap_line_in_file("b/pkgconfig_ban", "# but are undesirable. One entry per line, no whitespace.")
+    zap_line_in_file("b/requires_add", "# This file contains additional runtime requirements that did not get")
+    zap_line_in_file("b/requires_add", "# picked up automatically. One name per line, no whitespace.")
+    zap_line_in_file("b/requires_ban", "# This file contains runtime requirements that get picked up but are")
+    zap_line_in_file("b/requires_ban", "# undesirable. One entry per line, no whitespace.")
+    
+    zap_line_in_file_start(".spec", "Summary  : No detailed summary available")
+    
+    zap_plus_line_in_file("symbols")
+    zap_plus_line_in_file("symbols32")
+
+    zap_entire_file("b/whatrequires")
+
+    zap_empty_chunks()
+    
+    print_all()
+
+if __name__ == '__main__':
+    with tempfile.TemporaryDirectory() as workingdir:
+        main()
+