From ac0e9e8e9dbbd5e49a311e6e055d3ceaf3edb6f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mario=20H=C3=B6llein?= Date: Mon, 5 Nov 2018 10:34:38 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to apt run --- .etckeeper | 5 +- apt/preferences.d/pin-metasploit.pref | 3 + apt/sources.list.d/metasploit-framework.list | 1 + apt/trusted.gpg | Bin 13664 -> 15928 bytes cups/ppd/TEST_linux_a5xv.ppd | 163 ------------------- cups/printers.conf.O | 20 +++ hosts | 1 + 7 files changed, 27 insertions(+), 166 deletions(-) create mode 100644 apt/preferences.d/pin-metasploit.pref create mode 100644 apt/sources.list.d/metasploit-framework.list delete mode 100644 cups/ppd/TEST_linux_a5xv.ppd diff --git a/.etckeeper b/.etckeeper index 240f6c0..ee8986b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -9,7 +9,6 @@ mkdir -p './NetworkManager/dnsmasq.d' mkdir -p './ODBCDataSources' mkdir -p './X11/xkb' mkdir -p './apparmor.d/force-complain' -mkdir -p './apt/preferences.d' mkdir -p './at-spi2' mkdir -p './avahi/services' mkdir -p './binfmt.d' @@ -508,6 +507,7 @@ maybe chmod 0644 'apt/apt.conf.d/70debconf' maybe chmod 0644 'apt/apt.conf.d/90rkhunter' maybe chmod 0644 'apt/apt.conf.d/99update-notifier' maybe chmod 0755 'apt/preferences.d' +maybe chmod 0644 'apt/preferences.d/pin-metasploit.pref' maybe chmod 0664 'apt/sources.list' maybe chmod 0755 'apt/sources.list.d' maybe chmod 0644 'apt/sources.list.d/bitcoin-ubuntu-bitcoin-xenial.list' @@ -524,6 +524,7 @@ maybe chmod 0644 'apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list' maybe chmod 0644 'apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.distUpgrade' maybe chmod 0644 'apt/sources.list.d/linphone-ubuntu-release-xenial.list' maybe chmod 0644 'apt/sources.list.d/linphone-ubuntu-release-xenial.list.distUpgrade' +maybe chmod 0644 'apt/sources.list.d/metasploit-framework.list' maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list' maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.distUpgrade' maybe chmod 0644 'apt/sources.list.d/nodesource.list' @@ -1157,8 +1158,6 @@ maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd' maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd' maybe chgrp 'lp' 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O' maybe chmod 0640 'cups/ppd/HP-Color-LaserJet-MFP-M277dw.ppd.O' -maybe chgrp 'lp' 'cups/ppd/TEST_linux_a5xv.ppd' -maybe chmod 0640 'cups/ppd/TEST_linux_a5xv.ppd' maybe chgrp 'lp' 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd' maybe chmod 0640 'cups/ppd/ar-hp-HP-LaserJet-M806.ppd' maybe chgrp 'lp' 'cups/printers.conf.O' diff --git a/apt/preferences.d/pin-metasploit.pref b/apt/preferences.d/pin-metasploit.pref new file mode 100644 index 0000000..9a3931c --- /dev/null +++ b/apt/preferences.d/pin-metasploit.pref @@ -0,0 +1,3 @@ +Package: metasploit* +Pin: origin downloads.metasploit.com +Pin-Priority: 1000 diff --git a/apt/sources.list.d/metasploit-framework.list b/apt/sources.list.d/metasploit-framework.list new file mode 100644 index 0000000..e5f2d23 --- /dev/null +++ b/apt/sources.list.d/metasploit-framework.list @@ -0,0 +1 @@ +deb http://downloads.metasploit.com/data/releases/metasploit-framework/apt lucid main diff --git a/apt/trusted.gpg b/apt/trusted.gpg index 903c3721b3703dc936b3464a0cd6aec199ec0d48..293f3f2dd64ab195796cb93034ce6787d96dc32e 100644 GIT binary patch delta 2265 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 delta 7 Ocmdl{^B`+Of++wI1OvnX diff --git a/cups/ppd/TEST_linux_a5xv.ppd b/cups/ppd/TEST_linux_a5xv.ppd deleted file mode 100644 index 28e312e..0000000 --- a/cups/ppd/TEST_linux_a5xv.ppd +++ /dev/null @@ -1,163 +0,0 @@ -*PPD-Adobe: "4.3" -*% -*% "$Id: postscript.ppd,v 1.1.1.1 2000/08/24 19:23:13 goffioul Exp $" -*% -*% Sample Postscript driver PPD file for the Common UNIX Printing -*% System (CUPS). -*% -*% Michael Goffioul -*% -*APRemoteQueueID: "" -*FormatVersion: "4.3" -*FileVersion: "1.1" -*LanguageVersion: English -*LanguageEncoding: ISOLatin1 -*PCFileName: "PSTSCRPT.PPD" -*Manufacturer: "Postscript" -*Product: "(CUPS v1.1)" -*ModelName: "Generic postscript printer" -*ShortNickName: "Generic postscript printer" -*NickName: "Remote printer: Generic postscript printer" -*PSVersion: "(2017.000) 0" -*LanguageLevel: "2" -*ColorDevice: False -*DefaultColorSpace: Gray -*FileSystem: False -*Throughput: "8" -*LandscapeOrientation: Plus90 -*VariablePaperSize: False -*TTRasterizer: Type42 - -*UIConstraints: *PageSize Executive *InputSlot Manual -*UIConstraints: *PageSize Letter *InputSlot Manual -*UIConstraints: *PageSize Legal *InputSlot Manual -*UIConstraints: *PageSize A4 *InputSlot Manual -*UIConstraints: *PageSize A5 *InputSlot Manual -*UIConstraints: *PageSize B5 *InputSlot Manual - -*OpenUI *PageSize/Media Size: PickOne -*OrderDependency: 10 AnySetup *PageSize -*DefaultPageSize: Letter -*PageSize Letter/Letter: "<>setpagedevice" -*PageSize Legal/Legal: "<>setpagedevice" -*PageSize Executive/Executive: "<>setpagedevice" -*PageSize A4/A4: "<>setpagedevice" -*PageSize A5/A5: "<>setpagedevice" -*PageSize B5/B5 (JIS): "<>setpagedevice" -*PageSize EnvISOB5/Envelope B5: "<>setpagedevice" -*PageSize Env10/Envelope #10: "<>setpagedevice" -*PageSize EnvC5/Envelope C5: "<>setpagedevice" -*PageSize EnvDL/Envelope DL: "<>setpagedevice" -*PageSize EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageSize - -*OpenUI *PageRegion: PickOne -*OrderDependency: 10 AnySetup *PageRegion -*DefaultPageRegion: Letter -*PageRegion Letter/Letter: "<>setpagedevice" -*PageRegion Legal/Legal: "<>setpagedevice" -*PageRegion Executive/Executive: "<>setpagedevice" -*PageRegion A4/A4: "<>setpagedevice" -*PageRegion A5/A5: "<>setpagedevice" -*PageRegion B5/B5 (JIS): "<>setpagedevice" -*PageRegion EnvISOB5/Envelope B5: "<>setpagedevice" -*PageRegion Env10/Envelope #10: "<>setpagedevice" -*PageRegion EnvC5/Envelope C5: "<>setpagedevice" -*PageRegion EnvDL/Envelope DL: "<>setpagedevice" -*PageRegion EnvMonarch/Envelope Monarch: "<>setpagedevice" -*CloseUI: *PageRegion - -*DefaultImageableArea: Letter -*ImageableArea Letter/US Letter: "18 36 594 756" -*ImageableArea Legal/US Legal: "18 36 594 972" -*ImageableArea Executive/Executive: "18 36 504 684" -*ImageableArea A4/A4: "18 36 577 806" -*ImageableArea A5/A5: "18 36 403 559" -*ImageableArea B5/JIS B5: "18 36 498 693" -*ImageableArea EnvISOB5/B5 (ISO): "18 36 463 673" -*ImageableArea Env10/Com-10: "18 36 279 648" -*ImageableArea EnvC5/EnvC5: "18 36 441 613" -*ImageableArea EnvDL/EnvDL: "18 36 294 588" -*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504" - -*DefaultPaperDimension: Letter -*PaperDimension Letter/Letter: "612 792" -*PaperDimension Legal/Legal: "612 1008" -*PaperDimension Executive/Executive: "522 756" -*PaperDimension A4/A4: "595 842" -*PaperDimension A5/A5: "421 595" -*PaperDimension B5/B5 (JIS): "516 729" -*PaperDimension EnvISOB5/Envelope B5: "499 709" -*PaperDimension Env10/Envelope #10: "297 684" -*PaperDimension EnvC5/Envelope C5: "459 649" -*PaperDimension EnvDL/Envelope DL: "312 624" -*PaperDimension EnvMonarch/Envelope Monarch: "279 540" - -*OpenUI *InputSlot/Media Source: PickOne -*OrderDependency: 10 AnySetup *InputSlot -*DefaultInputSlot: Default -*InputSlot Default/Default: "" -*InputSlot Tray1/Tray 1: "<>setpagedevice" -*InputSlot Tray2/Tray 2: "<>setpagedevice" -*InputSlot Tray3/Tray 3: "<>setpagedevice" -*InputSlot Manual/Manual Feed: "<>setpagedevice" -*CloseUI: *InputSlot - -*OpenUI *Resolution/Output Resolution: PickOne -*OrderDependency: 20 AnySetup *Resolution -*DefaultResolution: 300dpi -*Resolution 150dpi/150 DPI: "<>setpagedevice" -*Resolution 300dpi/300 DPI: "<>setpagedevice" -*Resolution 600dpi/600 DPI: "<>setpagedevice" -*Resolution 1200dpi/1200 DPI: "<>setpagedevice" -*Resolution 2400dpi/2400 DPI: "<>setpagedevice" -*CloseUI: *Resolution - -*OpenUI *Duplex/Double-Sided Printing: PickOne -*OrderDependency: 20 AnySetup *Duplex -*DefaultDuplex: None -*Duplex None/Off: "<>setpagedevice" -*Duplex DuplexNoTumble/Long Edge (Standard): "<>setpagedevice" -*Duplex DuplexTumble/Short Edge (Flip): "<>setpagedevice" -*CloseUI: *Duplex - -*DefaultFont: Courier -*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM -*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM -*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM -*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM -*Font Bookman-Demi: Standard "(001.004S)" Standard ROM -*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM -*Font Bookman-Light: Standard "(001.004S)" Standard ROM -*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM -*Font Courier: Standard "(002.004S)" Standard ROM -*Font Courier-Bold: Standard "(002.004S)" Standard ROM -*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM -*Font Courier-Oblique: Standard "(002.004S)" Standard ROM -*Font Helvetica: Standard "(001.006S)" Standard ROM -*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM -*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM -*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM -*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM -*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM -*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM -*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM -*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM -*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM -*Font Palatino-Bold: Standard "(001.005S)" Standard ROM -*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM -*Font Palatino-Italic: Standard "(001.005S)" Standard ROM -*Font Palatino-Roman: Standard "(001.005S)" Standard ROM -*Font Symbol: Special "(001.007S)" Special ROM -*Font Times-Bold: Standard "(001.007S)" Standard ROM -*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM -*Font Times-Italic: Standard "(001.007S)" Standard ROM -*Font Times-Roman: Standard "(001.007S)" Standard ROM -*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM -*Font ZapfDingbats: Special "(001.004S)" Standard ROM -*% -*% End of "$Id: postscript.ppd,v 1.1.1.1 2000/08/24 19:23:13 goffioul Exp $". -*% -*cupsFilter: "*/* 0 -" diff --git a/cups/printers.conf.O b/cups/printers.conf.O index baa51e1..02102d6 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -37,3 +37,23 @@ KLimit 0 OpPolicy default ErrorPolicy retry-job + +UUID urn:uuid:fa9badb4-7d1d-3b6d-6308-47f302f70911 +Info TEST +Location +MakeModel Remote printer: Generic postscript printer +DeviceURI implicitclass:TEST_linux_a5xv +State Idle +StateTime 1541146099 +ConfigTime 1541146099 +Type 4182 +Accepting Yes +Shared No +JobSheets none none +QuotaPeriod 0 +PageLimit 0 +KLimit 0 +OpPolicy default +ErrorPolicy retry-job +Option cups-browsed true + diff --git a/hosts b/hosts index ccac0c2..36ede89 100644 --- a/hosts +++ b/hosts @@ -1,5 +1,6 @@ 127.0.0.1 localhost 127.0.1.1 zenbook +172.17.6.25 svnserver # The following lines are desirable for IPv6 capable hosts ::1 ip6-localhost ip6-loopback -- 2.43.0