From aaa004eac51ab752a0a7be59e5037799b252be7e Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Tue, 6 Aug 2019 16:08:41 +0100 Subject: xtrlock (2.9) unstable; urgency=medium * Apply a patch from Helmut Grohne to move away from the (deprecated) xmkmf. (Closes: #902648) * Correct a typo in the manual page. * Add Vcs-Git and Vcs-Browser metadata; packaging has been added to Salsa. * Add an example systemd service file to lock screen on suspend/sleep. * debian/rules: - Move to minimal "dh" style. - Ensure that patchlevel.h always matches the version in debian/changelog. * Misc packaging improvements: - Add a debian/gitlab-ci.yml. - Drop trailing whitepaces to prevent future VCS noise. - Explicitly specify the 3.0 (native) source format. - Drop versioned dependency on dpkg-dev for a version now satisfied in oldoldstable. - Drop double-space in long description. - Move to DEP-5 copyright file. - Add a simple autopkgtest. * Add myself to Uploaders. * Bump Standards-Version to 4.4.0. [dgit import package xtrlock 2.9] --- GPL-3.txt | 674 +++++++++++++++++++++++++++++++++++++++ Imakefile | 17 + Makefile.noimake | 29 ++ debian/README.Debian | 57 ++++ debian/changelog | 206 ++++++++++++ debian/control | 24 ++ debian/copyright | 35 ++ debian/gitlab-ci.yml | 12 + debian/menu | 1 + debian/rules | 26 ++ debian/source/format | 1 + debian/tests/0001-smoketest | 3 + debian/tests/control | 4 + debian/xtrlock.examples | 1 + debian/xtrlock.install | 1 + debian/xtrlock.lintian-overrides | 2 + debian/xtrlock.manpages | 1 + lock.bitmap | 19 ++ mask.bitmap | 19 ++ patchlevel.h | 1 + xtrlock.c | 274 ++++++++++++++++ xtrlock.man | 59 ++++ xtrlock.service | 28 ++ 23 files changed, 1494 insertions(+) create mode 100644 GPL-3.txt create mode 100644 Imakefile create mode 100644 Makefile.noimake create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gitlab-ci.yml create mode 100644 debian/menu create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100755 debian/tests/0001-smoketest create mode 100644 debian/tests/control create mode 100644 debian/xtrlock.examples create mode 100644 debian/xtrlock.install create mode 100644 debian/xtrlock.lintian-overrides create mode 100644 debian/xtrlock.manpages create mode 100644 lock.bitmap create mode 100644 mask.bitmap create mode 100644 patchlevel.h create mode 100644 xtrlock.c create mode 100644 xtrlock.man create mode 100644 xtrlock.service diff --git a/GPL-3.txt b/GPL-3.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/GPL-3.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Imakefile b/Imakefile new file mode 100644 index 0000000..68605d8 --- /dev/null +++ b/Imakefile @@ -0,0 +1,17 @@ +#! Imakefile for xtrlock - X Transparent Lock +#! +#! Copyright (C)1993,1994 Ian Jackson +#! +#! This is free software; you can redistribute it and/or modify +#! it under the terms of the GNU General Public License as published by +#! the Free Software Foundation; either version 2, or (at your option) +#! any later version. +#! +#! This is distributed in the hope that it will be useful, +#! but WITHOUT ANY WARRANTY; without even the implied warranty of +#! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#! GNU General Public License for more details. + +SingleProgramTarget(xtrlock,xtrlock.o,-lcrypt -lX11,) +InstallProgram(xtrlock,$(BINDIR)) +InstallManPage(xtrlock,$(MANDIR)) diff --git a/Makefile.noimake b/Makefile.noimake new file mode 100644 index 0000000..460cd67 --- /dev/null +++ b/Makefile.noimake @@ -0,0 +1,29 @@ +# Makefile for xtrlock - X Transparent Lock +# This Makefile provided for those of you who lack a functioning xmkmf. +# +# Copyright (C)1993,1994 Ian Jackson +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +LDLIBS=-lX11 +CC=gcc +CFLAGS=-Wall +INSTALL=install + +xtrlock: xtrlock.o + +xtrlock.o: xtrlock.c lock.bitmap mask.bitmap patchlevel.h + +install: xtrlock + $(INSTALL) -c -m 755 xtrlock /usr/bin/X11 + +install.man: + $(INSTALL) -c -m 644 xtrlock.man /usr/man/man1/xtrlock.1x diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..4e2779e --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,57 @@ +This is X Transparent Lock. Xtrlock is a very minimal X display lock +program, which uses nothing except the Xlib library. It doesn't +obscure the screen, it is completely idle while the display is locked +and you don't type at it, and it doesn't do funny things to the X +access control lists. On my system the binary is under 10K +(Linux/i386, compiled with gcc -O2 -m486 -s). + +Note that xtrlock currently does not work with shadow passwords. If +someone sends me some portable patches for shadow password support +I'll probably include them. + +[ Shadow passwords are now supported on Linux, and Solaris 2.x (not + tested). To work with shadow passwords, this program should be + compiled with -DSHADOW_PWD and installed setuid root (it will drop + privileges as soon as possible). The shadow-aware version will + still work fine if you don't have shadow passwords. + + April 9, 1996 + -- Marek Michalkiewicz ] + +You need an ANSI C compiler, such as GCC. Do not attempt to compile +xtrlock with an old C compiler such as most systems' `cc'. + +There is no support for X resources or command-line arguments - the +timeouts and cursor bitmaps and colours cannot be modified. If +someone sends me some Xlib-only X resource support I may include it. + +To install xtrlock: + +Build the program: + xmkmf + make + +Test it: + ./xtrlock + +Install it and the manpage: + really make install install.man + + +xtrlock is Copyright 1993, 1994 Ian Jackson. It is free software; you +can redistribute it and/or modify it under the terms of the GNU +General Public License as published by the Free Software Foundation; +either version 2, or (at your option) any later version. + +It is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +In order to save space I have not included a copy of version 2 of the +GNU General Public Licence here. If you do not have one, send me +email at , or write to me at Churchill +College, Cambridge, CB3 0DS, United Kingdom, or to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +It is also available by anonymous FTP from prep.ai.mit.edu. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..5f749d7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,206 @@ +xtrlock (2.9) unstable; urgency=medium + + * Apply a patch from Helmut Grohne to move away from the (deprecated) xmkmf. + (Closes: #902648) + * Correct a typo in the manual page. + * Add Vcs-Git and Vcs-Browser metadata; packaging has been added to Salsa. + * Add an example systemd service file to lock screen on suspend/sleep. + * debian/rules: + - Move to minimal "dh" style. + - Ensure that patchlevel.h always matches the version in debian/changelog. + * Misc packaging improvements: + - Add a debian/gitlab-ci.yml. + - Drop trailing whitepaces to prevent future VCS noise. + - Explicitly specify the 3.0 (native) source format. + - Drop versioned dependency on dpkg-dev for a version now satisfied in + oldoldstable. + - Drop double-space in long description. + - Move to DEP-5 copyright file. + - Add a simple autopkgtest. + * Add myself to Uploaders. + * Bump Standards-Version to 4.4.0. + + -- Chris Lamb Tue, 06 Aug 2019 16:08:41 +0100 + +xtrlock (2.8) unstable; urgency=low + + * patch from Simon Tatham to add a -f option [fork, and return success + from parent once lock acquired] (Closes: #823685) + + -- Matthew Vernon Sat, 21 May 2016 19:08:12 +0100 + +xtrlock (2.7) unstable; urgency=low + + * patch from Chris Lamb to make builds reproducible by adding -n to gzip + invocations (Closes: #777351) + + -- Matthew Vernon Sat, 07 Mar 2015 22:34:45 +0000 + +xtrlock (2.6) unstable; urgency=low + + * patch from Simon Ruderich to correctly add hardening flags + * check returns of setuid and setgid + * build-depend on dpkg-dev + + -- Matthew Vernon Tue, 07 Jan 2014 14:22:55 +0000 + +xtrlock (2.5) unstable; urgency=low + + * correct contributor name (sorry!) + * add hardening flags + * update version number + + -- Matthew Vernon Sun, 05 Jan 2014 16:27:52 +0000 + +xtrlock (2.4) unstable; urgency=low + + * add a -b option to blank the screen (code based on patch by Markus, + waldeck@gmx.de, for which thanks; documentation by myself. + (Closes: #636993) + + -- Matthew Vernon Sun, 05 Jan 2014 12:01:48 +0000 + +xtrlock (2.3) unstable; urgency=low + + * remove reference to xlock, which is no longer in Debian (Closes: #721724) + + -- Matthew Vernon Wed, 04 Sep 2013 15:37:38 +0100 + +xtrlock (2.2) unstable; urgency=low + + * Move menu entry to /usr/share/menu + * Change menu section to Screen/Locking + * Update standards-version + * Add a lintian override for being setgid shadow + + -- Matthew Vernon Tue, 26 Jun 2012 20:22:20 +0100 + +xtrlock (2.1) unstable; urgency=low + + * never exit non-zero without saying why. + * try repeatedly, with waits, to grab the keyboard (Closes: #316343). + * include a copy of the GPL in the source package (Closes: #519327). + * honour nostrip DEB_BUILD_OPTION (Closes: #438346). + * Debian's package is essentially upstream; only include one changelog + in the binary package (rather than one and a symlink) + * Don't install README.Debian any more, as it's mostly just build + instructions + + -- Matthew Vernon Tue, 26 Jun 2012 19:12:02 +0100 + +xtrlock (2.0-14) unstable; urgency=low + + * remove obsolete build-depends on xutils (closes: #579036) + + -- Matthew Vernon Thu, 13 May 2010 18:01:51 +0100 + +xtrlock (2.0-13) unstable; urgency=low + + * build-depend on x11proto-core-dev rather than the old x-dev + * build-depend on xutils-dev (closes: #485728) + + -- Matthew Vernon Tue, 23 Dec 2008 11:36:04 +0000 + +xtrlock (2.0-12) unstable; urgency=low + + * Install into /usr not /usr/X11R6 (closes: #362206, #363293) + + -- Matthew Vernon Tue, 18 Apr 2006 17:19:10 +0100 + +xtrlock (2.0-11) unstable; urgency=low + * Fix build-depends: for new etch (closes: #346840) + + -- Matthew Vernon Sat, 14 Jan 2006 15:30:28 +0000 + +xtrlock (2.0-10) unstable; urgency=low + + * Take over this package, since I seem to have some tuits + * Correct the Author's address in the manpage to something sensible + * Similarly the original packager's. + * For reference, the security problem fixed in -9 was CAN-2005-0079 + + -- Matthew Vernon Thu, 20 Jan 2005 14:02:10 +0000 + +xtrlock (2.0-9) unstable; urgency=high + + * Fix the problem whereby we unlocked on long input (closes: #278191, #278190) + * tidy up a switch statement (closes: #264173) + + -- Matthew Vernon Mon, 17 Jan 2005 10:47:09 +0000 + +xtrlock (2.0-8) unstable; urgency=low + + * Uploading with maintainer set to QA group + + -- Andrew Pollock Sun, 15 Feb 2004 18:32:12 +1100 + +xtrlock (2.0-7) unstable; urgency=low + + * Maintainer upload. + * Update to standards version 3.5.6. + * Removes buffer overrun potentiality (closes: #154738) + * Drop setgid privileges (closes: #154740) + + -- Martin Mitchell Sun, 1 Sep 2002 14:49:26 +1000 + +xtrlock (2.0-6.1) unstable; urgency=low + + * NMU + * Removed the buffer overrun potentiallity (closes: #154738) + * Update the code for remove the possibilty to read shadow file + (closes: #154740) + * Fix spelling error in the copyright file + * Fix the place where is stored the common-licenses + * Update the debian/rules to: + - strip the /usr/X11R6/bin/xtrlock + - include the section and priority in control + * Update the debian/control file: + - include the build-depends + - update the standard-version to 3.5.6 + + -- Otavio Salvador Sat, 31 Aug 2002 16:23:21 -0300 + +xtrlock (2.0-6) unstable; urgency=low + + * Update to standards version 3.0.1. + * Add menu entry. (closes: #46201) + + -- Martin Mitchell Thu, 28 Oct 1999 18:38:14 +1000 + +xtrlock (2.0-5) unstable; urgency=low + + * Correct installation path during package build. (#25055) + * Update to standards version 2.4.1. + * Update copyright file. + + -- Martin Mitchell Sun, 2 Aug 1998 13:01:29 +1000 + +xtrlock (2.0-4) unstable; urgency=low + + * Make xtrlock setgid shadow, instead of setuid root. (#7635,#8543) + + -- Martin Mitchell Thu, 4 Dec 1997 00:27:07 +1100 + +xtrlock (2.0-3) unstable; urgency=low + + * New maintainer. + + -- Martin Mitchell Thu, 27 Nov 1997 01:34:14 +1100 + +xtrlock (2.0-2.2) unstable; urgency=low + + * Non-maintainer release. + * Libc6 compile. + * Update from pre-2.0.0.0 standards. + + -- Martin Mitchell Wed, 22 Oct 1997 18:07:31 +1000 + +xtrlock-2.0 Debian 3 - Michael Meskes +Include shadow patches +Add architecture field (Bug#4041) +Minor changes to debian.rules +gzip manpage + +xtrlock-2.0 Debian 0 - sde + +Initial release. diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..33582b1 --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: xtrlock +Maintainer: Matthew Vernon +Uploaders: Chris Lamb +Section: x11 +Priority: optional +Build-Depends: + debhelper-compat (= 12), + libx11-dev, + x11proto-core-dev, +Vcs-Git: https://salsa.debian.org/debian/xtrlock.git +Vcs-Browser: https://salsa.debian.org/debian/xtrlock +Standards-Version: 4.4.0 +Rules-Requires-Root: binary-targets + +Package: xtrlock +Architecture: any +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Description: Minimal X display lock program + xtrlock is a very minimal X display lock program, which uses nothing + except the Xlib library. It doesn't obscure the screen, it is + completely idle while the display is locked and you don't type at it, + and it doesn't do funny things to the X access control lists. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..0026c62 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,35 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Ian Jackson +Upstream-Name: xtrlock + +Files: * +Copyright: + © 1993, 1994 Ian Jackson + © 1996 Marek Michalkiewicz +License: GPL-3+ + +Files: debian/* +Copyright: + © 1995 Stephen Early + © 1997 — 2002 Martin Mitchell + © 2002 Otavio Salvador + © 2005 — 2016 Matthew Vernon + © 2019 Chris Lamb +License: GPL-3+ + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + can be found in the /usr/share/common-licenses/GPL-3 file. diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml new file mode 100644 index 0000000..9dc298b --- /dev/null +++ b/debian/gitlab-ci.yml @@ -0,0 +1,12 @@ +image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest + +pages: + stage: deploy + except: + - tags + artifacts: + paths: + - public + script: + - gitlab-ci-git-buildpackage-all + - gitlab-ci-aptly diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..b4b218a --- /dev/null +++ b/debian/menu @@ -0,0 +1 @@ +?package(xtrlock):command="xtrlock" section="Screen/Locking" needs="x11" title="Xtrlock" longtitle="Xtrlock: X terminal lock" diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..8c6893c --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f + +DPKG_EXPORT_BUILDFLAGS = 1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/default.mk + +CFLAGS += -DSHADOW_PWD + +ifeq (,$(findstring ^$(DEB_VERSION_UPSTREAM),^$(shell cut -d'"' -f2 patchlevel.h))) +$(error (patchlevel.h out of sync with Debian version)) +endif + +%: + dh $@ + +override_dh_auto_build: + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) xtrlock.c -o xtrlock -lcrypt -lX11 + +override_dh_fixperms: + dh_fixperms -X/usr/bin/xtrlock + +override_dh_install: + dh_install + # xtrlock has to be setgid shadow to support shadow passwords + chown root.shadow debian/xtrlock/usr/bin/xtrlock + chmod 2755 debian/xtrlock/usr/bin/xtrlock diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/tests/0001-smoketest b/debian/tests/0001-smoketest new file mode 100755 index 0000000..9ad2c5a --- /dev/null +++ b/debian/tests/0001-smoketest @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/bin/xtrlock --help 2>&1 | grep usage diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..b9ef8d8 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,4 @@ +Tests: 0001-smoketest +Depends: + @, +Restrictions: allow-stderr diff --git a/debian/xtrlock.examples b/debian/xtrlock.examples new file mode 100644 index 0000000..3d0e946 --- /dev/null +++ b/debian/xtrlock.examples @@ -0,0 +1 @@ +xtrlock.service diff --git a/debian/xtrlock.install b/debian/xtrlock.install new file mode 100644 index 0000000..57cd0c9 --- /dev/null +++ b/debian/xtrlock.install @@ -0,0 +1 @@ +xtrlock usr/bin diff --git a/debian/xtrlock.lintian-overrides b/debian/xtrlock.lintian-overrides new file mode 100644 index 0000000..e0df932 --- /dev/null +++ b/debian/xtrlock.lintian-overrides @@ -0,0 +1,2 @@ +# xtrlock needs to be setgit shadow so it can read the shadow file +xtrlock: setgid-binary usr/bin/xtrlock 2755 root/shadow diff --git a/debian/xtrlock.manpages b/debian/xtrlock.manpages new file mode 100644 index 0000000..40db00b --- /dev/null +++ b/debian/xtrlock.manpages @@ -0,0 +1 @@ +xtrlock.man diff --git a/lock.bitmap b/lock.bitmap new file mode 100644 index 0000000..f953bc5 --- /dev/null +++ b/lock.bitmap @@ -0,0 +1,19 @@ +#define lock_width 28 +#define lock_height 40 +#define lock_x_hot 14 +#define lock_y_hot 21 +static char lock_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0xf8, 0xff, 0x7f, 0x00, 0xe0, 0xff, + 0x3f, 0x00, 0xc0, 0xff, 0x1f, 0x00, 0x80, 0xff, 0x0f, 0xfc, 0x03, 0xff, + 0x0f, 0xfe, 0x07, 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x07, 0xff, 0x0f, 0xfe, + 0x87, 0xff, 0x1f, 0xfe, 0x87, 0xff, 0x1f, 0xfe, 0x87, 0xff, 0x1f, 0xfe, + 0x87, 0xff, 0x1f, 0xfe, 0x87, 0xff, 0x1f, 0xfe, 0x87, 0xff, 0x1f, 0xfe, + 0x87, 0xff, 0x1f, 0xfe, 0x87, 0xff, 0x1f, 0xfe, 0x87, 0xff, 0x1f, 0xfe, + 0x87, 0xff, 0x1f, 0xfe, 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, + 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x01, 0xf0, 0x00, 0xf8, + 0x01, 0xf8, 0x01, 0xf8, 0x01, 0xf8, 0x01, 0xf8, 0x01, 0xf8, 0x01, 0xf8, + 0x01, 0xf8, 0x01, 0xf8, 0x01, 0xf0, 0x00, 0xf8, 0x01, 0x60, 0x00, 0xf8, + 0x01, 0x60, 0x00, 0xf8, 0x01, 0x60, 0x00, 0xf8, 0x01, 0x60, 0x00, 0xf8, + 0x01, 0x60, 0x00, 0xf8, 0x01, 0x60, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, + 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0xf8, + 0xff, 0xff, 0xff, 0xff}; diff --git a/mask.bitmap b/mask.bitmap new file mode 100644 index 0000000..96bb4d8 --- /dev/null +++ b/mask.bitmap @@ -0,0 +1,19 @@ +#define mask_width 28 +#define mask_height 40 +#define mask_x_hot 14 +#define mask_y_hot 21 +static char mask_bits[] = { + 0x00, 0xfe, 0x07, 0x00, 0x80, 0xff, 0x1f, 0x00, 0xc0, 0xff, 0x3f, 0x00, + 0xe0, 0xff, 0x7f, 0x00, 0xf0, 0xff, 0xff, 0x00, 0xf8, 0xff, 0xff, 0x01, + 0xf8, 0x03, 0xfc, 0x01, 0xf8, 0x01, 0xf8, 0x01, 0xfc, 0x01, 0xf8, 0x03, + 0xfc, 0x00, 0xf0, 0x03, 0xfc, 0x00, 0xf0, 0x03, 0xfc, 0x00, 0xf0, 0x03, + 0xfc, 0x00, 0xf0, 0x03, 0xfc, 0x00, 0xf0, 0x03, 0xfc, 0x00, 0xf0, 0x03, + 0xfc, 0x00, 0xf0, 0x03, 0xfc, 0x00, 0xf0, 0x03, 0xfc, 0x00, 0xf0, 0x03, + 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, + 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, + 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, + 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, + 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, + 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, + 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, + 0xff, 0xff, 0xff, 0x0f}; diff --git a/patchlevel.h b/patchlevel.h new file mode 100644 index 0000000..2ecc7e6 --- /dev/null +++ b/patchlevel.h @@ -0,0 +1 @@ +const char program_version[] = "2.9"; diff --git a/xtrlock.c b/xtrlock.c new file mode 100644 index 0000000..6117c6f --- /dev/null +++ b/xtrlock.c @@ -0,0 +1,274 @@ +/* + * xtrlock.c + * + * X Transparent Lock + * + * Copyright (C)1993,1994 Ian Jackson + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SHADOW_PWD +#include +#endif + +#include "lock.bitmap" +#include "mask.bitmap" +#include "patchlevel.h" + +Display *display; +Window window, root; + +#define TIMEOUTPERATTEMPT 30000 +#define MAXGOODWILL (TIMEOUTPERATTEMPT*5) +#define INITIALGOODWILL MAXGOODWILL +#define GOODWILLPORTION 0.3 + +struct passwd *pw; +int passwordok(const char *s) { +#if 0 + char key[3]; + char *encr; + + key[0] = *(pw->pw_passwd); + key[1] = (pw->pw_passwd)[1]; + key[2] = 0; + encr = crypt(s, key); + return !strcmp(encr, pw->pw_passwd); +#else + /* simpler, and should work with crypt() algorithms using longer + salt strings (like the md5-based one on freebsd). --marekm */ + return !strcmp(crypt(s, pw->pw_passwd), pw->pw_passwd); +#endif +} + +int main(int argc, char **argv){ + XEvent ev; + KeySym ks; + char cbuf[10], rbuf[128]; /* shadow appears to suggest 127 a good value here */ + int clen, rlen=0; + long goodwill= INITIALGOODWILL, timeout= 0; + XSetWindowAttributes attrib; + Cursor cursor; + Pixmap csr_source,csr_mask; + XColor csr_fg, csr_bg, dummy, black; + int ret, screen, blank = 0, fork_after = 0; +#ifdef SHADOW_PWD + struct spwd *sp; +#endif + struct timeval tv; + int tvt, gs; + + while (argc > 1) { + if ((strcmp(argv[1], "-b") == 0)) { + blank = 1; + argc--; + argv++; + } else if ((strcmp(argv[1], "-f") == 0)) { + fork_after = 1; + argc--; + argv++; + } else { + fprintf(stderr,"xtrlock (version %s); usage: xtrlock [-b] [-f]\n", + program_version); + exit(1); + } + } + + errno=0; pw= getpwuid(getuid()); + if (!pw) { perror("password entry for uid not found"); exit(1); } +#ifdef SHADOW_PWD + sp = getspnam(pw->pw_name); + if (sp) + pw->pw_passwd = sp->sp_pwdp; + endspent(); +#endif + + /* logically, if we need to do the following then the same + applies to being installed setgid shadow. + we do this first, because of a bug in linux. --jdamery */ + if (setgid(getgid())) { perror("setgid"); exit(1); } + /* we can be installed setuid root to support shadow passwords, + and we don't need root privileges any longer. --marekm */ + if (setuid(getuid())) { perror("setuid"); exit(1); } + + if (strlen(pw->pw_passwd) < 13) { + fputs("password entry has no pwd\n",stderr); exit(1); + } + + display= XOpenDisplay(0); + + if (display==NULL) { + fprintf(stderr,"xtrlock (version %s): cannot open display\n", + program_version); + exit(1); + } + + attrib.override_redirect= True; + + if (blank) { + screen = DefaultScreen(display); + attrib.background_pixel = BlackPixel(display, screen); + window= XCreateWindow(display,DefaultRootWindow(display), + 0,0,DisplayWidth(display, screen),DisplayHeight(display, screen), + 0,DefaultDepth(display, screen), CopyFromParent, DefaultVisual(display, screen), + CWOverrideRedirect|CWBackPixel,&attrib); + XAllocNamedColor(display, DefaultColormap(display, screen), "black", &black, &dummy); + } else { + window= XCreateWindow(display,DefaultRootWindow(display), + 0,0,1,1,0,CopyFromParent,InputOnly,CopyFromParent, + CWOverrideRedirect,&attrib); + } + + XSelectInput(display,window,KeyPressMask|KeyReleaseMask); + + csr_source= XCreateBitmapFromData(display,window,lock_bits,lock_width,lock_height); + csr_mask= XCreateBitmapFromData(display,window,mask_bits,mask_width,mask_height); + + ret = XAllocNamedColor(display, + DefaultColormap(display, DefaultScreen(display)), + "steelblue3", + &dummy, &csr_bg); + if (ret==0) + XAllocNamedColor(display, + DefaultColormap(display, DefaultScreen(display)), + "black", + &dummy, &csr_bg); + + ret = XAllocNamedColor(display, + DefaultColormap(display,DefaultScreen(display)), + "grey25", + &dummy, &csr_fg); + if (ret==0) + XAllocNamedColor(display, + DefaultColormap(display, DefaultScreen(display)), + "white", + &dummy, &csr_bg); + + + + cursor= XCreatePixmapCursor(display,csr_source,csr_mask,&csr_fg,&csr_bg, + lock_x_hot,lock_y_hot); + + XMapWindow(display,window); + + /*Sometimes the WM doesn't ungrab the keyboard quickly enough if + *launching xtrlock from a keystroke shortcut, meaning xtrlock fails + *to start We deal with this by waiting (up to 100 times) for 10,000 + *microsecs and trying to grab each time. If we still fail + *(i.e. after 1s in total), then give up, and emit an error + */ + + gs=0; /*gs==grab successful*/ + for (tvt=0 ; tvt<100; tvt++) { + ret = XGrabKeyboard(display,window,False,GrabModeAsync,GrabModeAsync, + CurrentTime); + if (ret == GrabSuccess) { + gs=1; + break; + } + /*grab failed; wait .01s*/ + tv.tv_sec=0; + tv.tv_usec=10000; + select(1,NULL,NULL,NULL,&tv); + } + if (gs==0){ + fprintf(stderr,"xtrlock (version %s): cannot grab keyboard\n", + program_version); + exit(1); + } + + if (XGrabPointer(display,window,False,(KeyPressMask|KeyReleaseMask)&0, + GrabModeAsync,GrabModeAsync,None, + cursor,CurrentTime)!=GrabSuccess) { + XUngrabKeyboard(display,CurrentTime); + fprintf(stderr,"xtrlock (version %s): cannot grab pointer\n", + program_version); + exit(1); + } + + if (fork_after) { + pid_t pid = fork(); + if (pid < 0) { + fprintf(stderr,"xtrlock (version %s): cannot fork: %s\n", + program_version, strerror(errno)); + exit(1); + } else if (pid > 0) { + exit(0); + } + } + + for (;;) { + XNextEvent(display,&ev); + switch (ev.type) { + case KeyPress: + if (ev.xkey.time < timeout) { XBell(display,0); break; } + clen= XLookupString(&ev.xkey,cbuf,9,&ks,0); + switch (ks) { + case XK_Escape: case XK_Clear: + rlen=0; break; + case XK_Delete: case XK_BackSpace: + if (rlen>0) rlen--; + break; + case XK_Linefeed: case XK_Return: + if (rlen==0) break; + rbuf[rlen]=0; + if (passwordok(rbuf)) goto loop_x; + XBell(display,0); + rlen= 0; + if (timeout) { + goodwill+= ev.xkey.time - timeout; + if (goodwill > MAXGOODWILL) { + goodwill= MAXGOODWILL; + } + } + timeout= -goodwill*GOODWILLPORTION; + goodwill+= timeout; + timeout+= ev.xkey.time + TIMEOUTPERATTEMPT; + break; + default: + if (clen != 1) break; + /* allow space for the trailing \0 */ + if (rlen < (sizeof(rbuf) - 1)){ + rbuf[rlen]=cbuf[0]; + rlen++; + } + break; + } + break; + default: + break; + } + } + loop_x: + exit(0); +} diff --git a/xtrlock.man b/xtrlock.man new file mode 100644 index 0000000..fccbca3 --- /dev/null +++ b/xtrlock.man @@ -0,0 +1,59 @@ +.TH XTRLOCK 1 +.SH NAME +xtrlock \- Lock X display until password supplied, leaving windows visible +.SH SYNOPSIS +.B xtrlock [-b] [-f] +.SH DESCRIPTION +.B xtrlock +locks the X server till the user enters their password at the keyboard. + +While +.B xtrlock +is running, the mouse and keyboard are grabbed and the mouse cursor +becomes a padlock. Output displayed by X programs, and windows put up +by new X clients, continue to be visible, and any new output is +displayed normally. + +The mouse and keyboard are returned when the user types their +password, followed by Enter or Newline. If an incorrect password is +entered the bell is sounded. Pressing Backspace or Delete erases one +character of a password partially typed; pressing Escape or Clear +clears anything that has been entered. + +If too many attempts are made in too short a time further keystrokes +generate bells and are otherwise ignored until a timeout has expired. + +The X server screen saver continues to operate normally; if it comes +into operation the display may be restored by the usual means of +touching a key (Shift, for example) or the mouse. +.SH OPTIONS +.TP +\fB\-b\fR +blank the screen as well as displaying the padlock +.TP +\fB\-f\fR +fork after locking is complete, and return success from the parent +process +.SH X RESOURCES, CONFIGURATION +None. +.SH BUGS +Additional input devices other than the keyboard and mouse are not +disabled. + +The timeouts, bitmaps and mouse cursor colour cannot be modified. +.SH SEE ALSO +.BR X "(1), Xlib Documentation." +.SH AUTHOR +Ian Jackson +.SH COPYRIGHT +Copyright (C) 1993, 1994 by Ian Jackson. + +Permission to use, copy, modify and distribute this software and its +documentation is granted under the terms of the GNU General Public +Licence, version 2 or later, as published by the Free Software +Foundation. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. diff --git a/xtrlock.service b/xtrlock.service new file mode 100644 index 0000000..58d85de --- /dev/null +++ b/xtrlock.service @@ -0,0 +1,28 @@ +# Example systemd service to lock screen on sleep/suspend +# +# To install: +# +# * Copy this file to /etc/systemd/system/xtrlock.service +# * Replace the "FIXME" entries. +# * Run: sudo systemctl enable xtrlock +# +# As user units cannot depend on system units, we cannot provide this via the +# per-user systemd instance. +# +# -- Chris Lamb Tue, 06 Aug 2019 16:05:59 +0100 + +[Unit] +Description=Lock screen +Requires=network.target +After=sleep.target +DefaultDependencies=no + +[Service] +ExecStart=/usr/bin/xtrlock +User=FIXME +Group=FIXME +Environment=DISPLAY=:0 +Type=oneshot + +[Install] +WantedBy=sleep.target -- cgit v1.2.3